cmake: Silence cmake policy warning CMP0058.

See: cmake --help-policy CMP0058

CMakeLists.txt

@@ -31,6 +31,8 @@ endif()
 
 set(ALL_TARGETS fex visualboyadvance-m vbamcore vbam)
 
+add_custom_target(generate)
+
 #Output all binaries at top level
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 

cmake/HostCompile.cmake

@@ -21,9 +21,9 @@ function(host_compile src dst_cmd)
 	set(compile_command ${CMAKE_C_COMPILER} ${src} /link "/out:${dst}")
     endif()
 
-    execute_process(COMMAND ${compile_command} OUTPUT_VARIABLE compile_out ERROR_VARIABLE compile_err RESULT_VARIABLE compile_result)
+    add_custom_command(
-
+        OUTPUT "${dst}"
-    if(NOT compile_result EQUAL 0)
+        COMMAND ${compile_command}
-        message(FATAL_ERROR "Failed compiling ${src} for the host: ${compile_err}")
+        DEPENDS "${src}"
-    endif()
+    )
 endfunction()

cmake/PathRun.cmake

@@ -1,71 +1,16 @@
 function(make_path_run_wrapper cmd target)
+    get_filename_component(name "${target}" NAME)
     get_filename_component(cmd_resolved "${cmd}" REALPATH)
     get_filename_component(base_name "${cmd_resolved}" NAME)
     get_filename_component(dir_name  "${cmd_resolved}" DIRECTORY)
 
     set(source "${target}.c")
 
-    file(WRITE "${source}"
+    configure_file(src/gcc-wrap.c.in "${source}")
-"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#define BUF_SZ 4096
-
-#ifdef _WIN32
-    #include <process.h>
-    #define PATH_SEP ';'
-    #define setenv(var, val, dummy) _putenv_s(var, val)
-    #define execvp my_execvp
-#else
-    #include <unistd.h>
-    #define PATH_SEP ':'
-#endif
-
-char* dir_name  = \"${dir_name}\";
-char* base_name = \"${base_name}\";
-
-int main(int argc, char** argv) {
-    size_t dir_len  = strlen(dir_name);
-    char* path      = getenv(\"PATH\");
-    size_t path_len = strlen(path);
-    char* new_path  = malloc(dir_len + path_len + 2);
-    char** new_argv = malloc(sizeof(char*) * argc);
-    char** p;
-    char buf[BUF_SZ];
-
-    strcpy(new_path, dir_name);
-    new_path[dir_len] = PATH_SEP;
-    strcpy(new_path + dir_len + 1, path);
-
-    setenv(\"PATH\", new_path, 1);
-
-    free(new_path);
-
-    p = new_argv;
-    *(p++) = base_name;
-    while (*(++argv)) *(p++) = *argv;
-    *p = NULL;
-
-    execvp(base_name, new_argv);
-
-    // this is only reached if exec failed
-    snprintf(buf, BUF_SZ, \"%s: exec failed\", argv[0]);
-    perror(buf);
-
-    return EXIT_FAILURE;
-}
-
-#ifdef _WIN32
-int my_execvp(char* cmd, char** argv) {
-    int ret = _spawnvp(_P_WAIT, cmd, argv);
-    if (ret == -1) return ret;
-    exit(ret);
-}
-#endif
-")
 
     include(HostCompile)
     host_compile("${source}" "${target}")
+
+    add_custom_target(generate_${name} DEPENDS "${CMAKE_BINARY_DIR}/${name}")
+    add_dependencies(generate generate_${name})
 endfunction()

fex/CMakeLists.txt

@@ -42,3 +42,5 @@ ADD_LIBRARY(
     STATIC
     ${SRC_FEX}
 )
+
+add_dependencies(fex generate)

src/gcc-wrap.c.in

@@ -0,0 +1,57 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#define BUF_SZ 4096
+
+#ifdef _WIN32
+    #include <process.h>
+    #define PATH_SEP ';'
+    #define setenv(var, val, dummy) _putenv_s(var, val)
+    #define execvp my_execvp
+#else
+    #include <unistd.h>
+    #define PATH_SEP ':'
+#endif
+
+char* dir_name  = "${dir_name}";
+char* base_name = "${base_name}";
+
+int main(int argc, char** argv) {
+    size_t dir_len  = strlen(dir_name);
+    char* path      = getenv("PATH");
+    size_t path_len = strlen(path);
+    char* new_path  = malloc(dir_len + path_len + 2);
+    char** new_argv = malloc(sizeof(char*) * argc);
+    char** p;
+    char buf[BUF_SZ];
+
+    strcpy(new_path, dir_name);
+    new_path[dir_len] = PATH_SEP;
+    strcpy(new_path + dir_len + 1, path);
+
+    setenv("PATH", new_path, 1);
+
+    free(new_path);
+
+    p = new_argv;
+    *(p++) = base_name;
+    while (*(++argv)) *(p++) = *argv;
+    *p = NULL;
+
+    execvp(base_name, new_argv);
+
+    // this is only reached if exec failed
+    snprintf(buf, BUF_SZ, "%s: exec failed", argv[0]);
+    perror(buf);
+
+    return EXIT_FAILURE;
+}
+
+#ifdef _WIN32
+int my_execvp(char* cmd, char** argv) {
+    int ret = _spawnvp(_P_WAIT, cmd, argv);
+    if (ret == -1) return ret;
+    exit(ret);
+}
+#endif